Bug 1098607 - Unbreak build BSDs and Solaris after bug 1072093. r=kats