Back out bug 860591 (rev 8488f69f8f91) because it causes orange, resulting in a CLOSED TREE