Bug 1043699 - Backout of changeset 6921bd616ff1. DONTBUILD. CLOSED TREE. r=backout