Alternative Options for #611310