Ensure backward comp.