Revert 5229af1..0c8904c

This rolls back to commit 5229af13988f4b631e5e13f55a1c87831f6bfc4b.