Revert a2dfe42..0598ef6

This rolls back to commit a2dfe425ca18b97894f71433b36c2fbec6a11499.