Revert "Merge pull request #1649 from zombie/1003253-timeout-after"

This reverts commit 7432dcc7084fd88446a1934d88b8aeb3decdbee9, reversing
changes made to 85b79d566213da51ee6d6e1be962776c799ea7e3.
Revert bug 893276 for causing bug 1058840.