Backed out changesets 3cd79438d0ec and 3ba3af64ad64 (bug 950590) for bustage.
DONTBUILD