Actually adhere to the max attempts counter
Cutting 1.0.4