I propose this patch for 2.10..master.
This will create a new commit in order to revert the existing changes.
