Backed out changeset 2b1c2663f92a (bug 1087038) because it depends on a patch that was backed out.
CLOSED TREE