Maybe add a comment that this needs to be changed when @jmather PR is merged