Alternative Options for #349255