Revert "CHG: FloatingOrigin tweaks."

This reverts commit bb7a2acfa0c363c654357946895cd68d3a154fbc.