Revert 2486585..0e8cc90

This rolls back to commit 2486585748e616bf5635e7fd085dc8be766673a9.