PERF-8 Backwards compatibility.