Alternative Options for #611311