These don't help so lets just remove these changes, merge this per, and then deal with the z-offset issues properly in #4762.