Revert "Rollback"

This reverts commit 4e0906f238dd2eb3e11dad8c7bf6734274842ecf.