Move things around so 9.4 can be consistent with 9.3