Revert "Revert "Roll back""

This reverts commit 5f6c3624470aa33fe29c7f59a7433e947bbec727.