Undo previous change as it required an extra AJAX call when the data should already exist on the form.
Authored by: b_calderwood 2012-01-24
Parent: [r5983]
Child: [r5985]