Partial solution (quick hack) for bug 12970.