Alternative Options for #541770