Revert 0149a0d..1242ea7

This rolls back to commit 0149a0dea2a652045bf1dd5efc8de28513254493.