Reverted one of the changes introduced by the previous cherry-pick.
Merge pull request #1243 from hchiorean/MODE-2299-master-cherry-pick-fix

Reverted one of the changes introduced by the previous cherry-pick.