Patch for r171.
Please file a bug report following all the guidelines if you have trouble, otherwise we can't help.