Backed out changesets 064af1926654 and d3df3a3445a0 (bug 840315) for emulator timeouts. a=backout