Add backwards compatibility in case #2530 isn't merged yet