Prep for #582