Revert irrelevant changes from commit #16191.