Revert e3b703c..bca9b18

This rolls back to commit e3b703cd73148ed0b34c95630bc4318400f042d3.