Revert bd97fed..72c235b

This rolls back to commit bd97fed8aec3326ae86ee10168c0ab45cbd74a97.