Backed out changeset 7dcc83c574ed (bug 1050700) by request; CLOSED TREE DONTBUILD