diff --git a/token/cli/src/clap_app.rs b/token/cli/src/clap_app.rs
index c9be048383e..33aa0343728 100644
--- a/token/cli/src/clap_app.rs
+++ b/token/cli/src/clap_app.rs
@@ -272,17 +272,6 @@ impl TryFrom<CliAuthorityType> for AuthorityType {
 }
 
 pub fn owner_address_arg<'a>() -> Arg<'a> {
-    Arg::with_name(OWNER_ADDRESS_ARG.name)
-        .long(OWNER_ADDRESS_ARG.long)
-        .takes_value(true)
-        .value_name("OWNER_ADDRESS")
-        .validator(|s| is_valid_pubkey(s))
-        .help(OWNER_ADDRESS_ARG.help)
-}
-
-// Temporary function that uses proper parsing to minimize commit size
-// TODO: use this to replace `owner_address_arg`
-pub fn owner_address_arg_temp<'a>() -> Arg<'a> {
     Arg::with_name(OWNER_ADDRESS_ARG.name)
         .long(OWNER_ADDRESS_ARG.long)
         .takes_value(true)
@@ -1237,7 +1226,7 @@ pub fn app<'a>(
                             "Lock the owner of this token account from ever being changed"
                         ),
                 )
-                .arg(owner_address_arg_temp())
+                .arg(owner_address_arg())
                 .nonce_args(true)
         )
         .subcommand(
@@ -1796,7 +1785,7 @@ pub fn app<'a>(
                         .help("Specify the token account to close \
                             [default: owner's associated token account]"),
                 )
-                .arg(owner_address_arg_temp())
+                .arg(owner_address_arg())
                 .arg(multisig_signer_arg())
                 .nonce_args(true)
                 .offline_args(),
@@ -1850,7 +1839,7 @@ pub fn app<'a>(
                         .required_unless("address")
                         .help("Token of associated account. To query a specific account, use the `--address` parameter instead"),
                 )
-                .arg(owner_address_arg_temp().conflicts_with("address"))
+                .arg(owner_address_arg().conflicts_with("address"))
                 .arg(
                     Arg::with_name("address")
                         .value_parser(SignerSourceParserBuilder::default().allow_all().build())
@@ -1914,7 +1903,7 @@ pub fn app<'a>(
                             "Print token account addresses only"
                         ),
                 )
-                .arg(owner_address_arg_temp())
+                .arg(owner_address_arg())
         )
         .subcommand(
             SubCommand::with_name(CommandName::Address.into())
@@ -1930,7 +1919,7 @@ pub fn app<'a>(
                                [Default: return the client keypair address]")
                 )
                 .arg(
-                    owner_address_arg_temp()
+                    owner_address_arg()
                         .requires("token")
                         .help("Return the associated token address for the given owner. \
                                [Default: return the associated token address for the client keypair]"),
@@ -2380,7 +2369,7 @@ pub fn app<'a>(
                         .required(true)
                         .help("Specify the address of the account to send lamports to"),
                 )
-                .arg(owner_address_arg_temp())
+                .arg(owner_address_arg())
                 .arg(multisig_signer_arg())
         )
         .subcommand(