Alternative Options for #893735