Revert "Roll back"

This reverts commit a46cc7590d550dc8a49225ebec5a9cf69204729a.
Revert "Revert "More updates""

This reverts commit cb6964673f32ca3ae050879a147d7b5ad01dd377.