Add back a condition accidentially removed in r184470.