Revert d1a45c0..1c14403

This rolls back to commit d1a45c092dc256969fab2dbc74c192218bc8a08f.