Temporary (?) fix for #121994