Revert fix on order & fix OrderedGlobalDeclarations