Bug 968050 - Erase backward compatibility codes for Bug 791506