Be more backwards-compatible.