Revert f41730c..afc94f7

This rolls back to commit f41730c9527d4678821c19ed21bddda49c0460aa.