Re-apply master branch's change (c875bbb019):