Revert d326077..e2c6e26

This rolls back to commit d326077647e0ee7610c1e817ef8ebf34a459ea91.