Backwards compatibility in #830