As above, this shouldn't be conditional. We want to return this error on < 17.0-rc1