Revert d7632c0..25ebc27

This rolls back to commit d7632c06321723ca0bc98dda531d2ef34338b413.