Revert previous commit that changed how -l timeout is handled.
Decided that wasn't the best approach and am reverting the code to the original source.