Backed out changeset a96fb85d42bf (bug 851338) because of Linux build failures

Landed on a CLOSED TREE