Revert 0eafbbf..9edf614

This rolls back to commit 0eafbbf8d7c4920d7470432c878d0c146a423f27.