These are used (and deleted) later by the callers.

This is a temporary fix so that it will go into the 20.12 release.
A proper fix as outlined in Comment 3 of the bug report should go to
master.

BUG: 422665
FIXED-IN: 20.12.1