Revert unnecessary reordering change.
Changes to support ACCESS coupling.