Revert 53465a4..1de1229

This rolls back to commit 53465a415269c4665588cd82efd94b479fcd7bb4.