Remove :message option and defer to I18n