Backed out changeset e6430ac52054 (bug 864447) for OS X make check crashes