Recover the 2.0 compatibility.