Backed out changeset 46b2f793c2c9 (bug 1060102) for  Linux x64 debug M-3 Test failures