Revert dd066c3..d6de6f1

This rolls back to commit dd066c385c0d4ce29aaf31d08158dfd64ecc72f5.