Revert cd117a3..00b466d

This rolls back to commit cd117a3f4df7e1966b4abc2313249783865cf646.