Reapply the "or" half of r108136, which seems to be less problematic.