Extract AR 3.2 fallbacks in their own module