@jamalex I think I have the right fix submitted for this now.  Please start the second pass at your convenience!