Revert "Rollback"

This reverts commit c9f77d533b4fdd304887445d79343fcf0602dbfa.