Reverting two lines from commit ebc5e960955de44d51544a3efad4b8562492a772 that broke PSM graphics.
Merge branch 'PSMRenderingFix' into integratedFixes