Similar change to the Linux branch

It's like I said I'd do in the Linux branch. Now I'll make a similar change in the Master branch, as well.