Bug 968050 - Erase backward compatibility codes for Bug 791506
Merge pull request #16110 from masap/20140210

Bug 968050 - Erase backward compatibility codes for Bug 791506