Revert d9a6ab2..b119987

This rolls back to commit d9a6ab2387cd92a025d6eda9964612c5e0fd4470.