Revert b78d1a5..b8024ba

This rolls back to commit b78d1a5d2967506460657b0542e38bd9bb1a0136.