Make sure that fields filled before tracker change are preserved.
Authored by: jplang 2013-02-16
Parent: [r11409]
Child: [r11411]
