Revert 3bdd5d8..24917fb

This rolls back to commit 3bdd5d880a0b5a27bac1fc8e3d0f77f4a51272f1.