Reapply a fixed version of r133285.