Backed out changesets fabe232e8be9 and c84b0156ae03 (bug 793860) for Linux mochitest-2 timeouts.