These were already removed in master, so adding an extra commit in the 28.x branch to remove their use. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>