Two patches: [1] does the actual work, and [2] removes unnecessary backward compatibility. I feel that [2] should be applied for the reasons given in the patch descriptiopn, but I put it as a separate patch just in case you guys don't agree.