Revert 7020d33..f0ef9f3

This rolls back to commit 7020d33fe05b6726a785f8d07416c9854b39c738.