Revert e4dd96f..ec50b30

This rolls back to commit e4dd96f625d4e12d5218c44a4a467fd7e0f1eb19.