Alternative Options for #842216