Revert "Something broke. Reverting back."

This reverts commit 76d7391c1aeb3590b894de38cdc270ef6d23fa26.