Roll back some changes (2)

Sorry for the noise. I missed some changes to revert.