Revert Bug 960901

Possibility this will make travis happy.

https://bugzilla.mozilla.org/show_bug.cgi?id=960901