Alternative Options for #245387