Revert 4c03624..08436f0

This rolls back to commit 4c036241c81c5558177eb86aa0d45d125934bd2b.