Revert experimental extended timelimit

There was an effort experimenting to explore the behavior around the timelimit. This effort is finished and the changes now reverted.