Revert "Rollback"

This reverts commit 320167d046c05b260561187a2a8a5c8972e3a104.