This reverts commit 23a98ffb.

[ci skip]

The fix commited in e2a070cf was returning the `new_target`, as
a try to return whatever user replaced association with. The
problem is, the resulting association target may be ordered
differently. In such case we want to return the target that
will be later used for that association.

Bug #6289