Revert

This rolls back to commit e7ca844a5455345f6ff381d830de534cfdd383a4.