Revert "Rollback"

This reverts commit c65423b0ab2588a683e773e1884bd26f5bdbdf9a.