Remove code for back-compatibility.