Backed out 2 changesets (bug 941012, bug 931921) for suspicion of breaking Mn on OSX. CLOSED TREE

Backed out changeset c50cca7d248a (bug 941012)
Backed out changeset eb8d750eabb3 (bug 931921)