Revert c99f6fd..66ad170

This rolls back to commit c99f6fd8445867525e2c32e7c686614289b4e4a8.