Revert 0b5f0ee..c9f5d6e

This rolls back to commit 0b5f0ee88a4bc7bf500f0c0fd205f2ed56e93600.