Alternative Options for #873489