Too late for 1.38, and I'm not entirely sure it should be fixed.