Roll r168668 back in.