Port bug 585011 to comm-central, rs=build system port by build peer