Can this be fixed for 1.38?

Too late for 1.38, and I'm not entirely sure it should be fixed.
 
Andrew Sutton
andrew.n.sutton@gmail.com