Revert 46353a6..b91330d

This rolls back to commit 46353a6992803e00ceab9599209c6308ae5f3f72.