Revert 671863d..3870fba

This rolls back to commit 671863d7eb011c73302ba7a575b13f981d733c1a.