Fix inaccurate cherry-pick in a3ffd48945.
Merge pull request #11794 from s0undt3ch/2014.1

Fix inaccurate cherry-pick in a3ffd48945.