No longer need this warning if this is merged