Revert d4a47fd..dd89daf

This rolls back to commit d4a47fdcaee568b53480a1a1efd059415886516a.