Make adbed9d633 backwards-compatible with client