[BUGFIX] Apply missing patch from AOE changeset