Backed out changeset 697eb6db7d96 (bug 930808) for OS X make check failures