Revert aa1cb42..2143937

This rolls back to commit aa1cb42df9b4913643e937d4ce0c0ddb4b2da8b2.