This reverts commit ccd11d58, reversing
changes made to 54c05acd.

Reason: This caused a regression when the associated record is created
in a before_create callback. See
https://github.com/rails/rails/pull/12413#issuecomment-25848163