Alternative Options for #1125367