Request for review: reload followed by foreign key assignment throws an error

Tested patch against edge is here:

  http://rails.lighthouseapp.com/projects/8994/tickets/1076

FYI, this bug was introduced less than a week ago (in fcf31cb7).