Revert "Rollback"

This reverts commit 02a9f485cd71b89bbceb5e4ec3166de63c03334b.