Revert 43e8e4b..be85aaa

This rolls back to commit 43e8e4bf459b8e573278d84fbf2a4a4224e90fef.