Still intended; admittedly it'd be better to fix the call sites.