Back out 9a57cd3e5a93:b62548e26499 (bug 865745) for causing an unexpected exception in a mochiperf test