Merge missed r262819, that fixes broken build.