Actually ended up submitting patch for bug 940554