Back out fe0fa358d7bc (bug 1102666)
CLOSED TREE