Please backport to 2.7 as well.
2.7
This will create a new commit in order to revert the existing changes.
