Second attempt at fixing the problem described at r16578.
Authored by: bugman 2012-06-01
Parent: [r16578]
Child: [r16580]