Alternative Options for #813608