Revert r187626 (and r188025) as it caused a PLT regression