Revert 17c4e23..4a7e710

This rolls back to commit 17c4e230105103f74b01cc16808ede866ed2e849.