Revert "Rollback"

This reverts commit 68a965640d9eb03d825979293bdbf197b4b49eef.