Import fix form the previous commit.
Authored by: bugman 2013-03-24
Parent: [r19122]
Child: [r19124]