Revert "Rollback"

This reverts commit f3fd559601702006f202ed2b4f4abff159b3a991.