Backed out changeset eab1c325d9fb (bug 908191) since it already landed on m-i