Revert commit #17603, it should have been part of #17617.