Temporary fix for #121830