Revert 0ae2ec6..ab91da5

This rolls back to commit 0ae2ec6e092bdf5e3c1378dcee446a0c7575eb34.
Resetting untouched files to the base.