Backed out 2 changesets (bug 1000695) for introducing a near permafail on linux bc3

Backed out changeset 43306fac27e1 (bug 1000695)
Backed out changeset fcf5abdf9706 (bug 1000695)