Alternative Options for #803614