Revert "Revert "Roll back""

This reverts commit e1e804ffe35f9e6c6411b8ed6425af3f8e72f608.