Prep for moving to 24.4