Revert e7ee824..06a981a

This rolls back to commit e7ee82440a83e9af17d0ba964cd0d70ae19033bf.