Revert fb40f35..1728007

This rolls back to commit fb40f3525ab97ed20165ffde9d8b2f4ab85ed413.
Try one more