Revert 9fc14d2..4124306

This rolls back to commit 9fc14d269f87166a56fd495837d725b97d8999e3.