Revert f4775c1..82dfe75

This rolls back to commit f4775c1370803c4de2c1bff24888b661c3125900.