Import fix for the previous change (r22662).
Authored by: bugman 2014-04-09
Parent: [r22662]
Child: [r22664]