Merge pull request #6637 from JosJuice/projection-hack-leftovers Remove leftovers of projection hack support