The previous commit (r16010) did not work - this fixes it.
Authored by: bugman 2012-05-05
Parent: [r16010]
Child: [r16012]
