Backout 95a4b87a0583 (bug 894948) for causing an octane-crypto regression on a CLOSED TREE