Revert bd1d38a..e376a84

This rolls back to commit bd1d38ac3491e90be1d4d5aa1ff8ecd6876ea61f.