Alternative Options for #678286