We removed the per-stage timeouts, so I think we should remove tests testing for them instead of adding the timeouts back?

/cc @joshk