Update original custom builder to be inline with the new ExternalCommandBuilder.