Backed out changeset 3325dc888b50 (bug 952977) for build failures

--HG--
extra : rebase_source : b29c343cc0e4d8df5c927742657fa93895b738d1