Import fixes for the recent rearrangements.
Authored by: bugman 2013-03-24
Parent: [r19112]
Child: [r19114]
