- Revert "optimize GoalSelector update order"