Bug 1064002 - Back my change out. DONTBUILD