I'd rather revert the commit in this case.  Changing the assignment order has a
significant risk of breakage with other weird controllers.

Could you confirm that just reverting the commit fixes the problem?  Once after
it's confirmed, I'll submit a fix revert patch for 3.14.x.  Thanks.