Revert 59325ec..41ded7c

This rolls back to commit 59325ec7952a971ac0df942343dcdc48b1fa2339.