Alternative Options for #611312