Fix r209807 which inadvertently removed things