This is wrong. You don't want to conditionalize this on version. If someone tries to request maps on <17.0-rc1 then we should throw a badarg and not ignore the option.