Backed out changeset 1e38b4aa8889 (bug 986160) for  breaking Nightly builds