7.x wrlc 66

Should we be respecting the time limit too?