Revert f02a7dd..e0a7267

This rolls back to commit f02a7dda72d1fcc16c595de185cde091fdb39e36.