Revert cbd85ba..b011d3f

This rolls back to commit cbd85baefde291256d735cc4de0d347af661594a.