Revert d7f6833..ed32175

This rolls back to commit d7f683369e0cb6595fa517d07bd8dfc05b904114.