Make a bit more sense and consistent with when apc is enabled