Revert "Broke something"

This reverts commit 04e80464005f1cbb00995db7a23e727953795116.
Revert "Revert "Broke something""

This reverts commit 2f4897fe02b51e432f10cf9f80dab39a7b46ec1e.