Yeah. Doing this will make it so that we don't have to rejigger interpolation in settings for PUP-1596.