Back out 0fc2a36c23d8 (bug 844253) for bustage
CLOSED TREE