Revert aa4468b..f65e804

This rolls back to commit aa4468b0269177ef55eb0b49c4a4b8c9c88c133c.