Revert "Roll this back if it breaks"

This reverts commit c2a3328c3c5b5b6b0658395ff2fc42efd0f444c4.