MDL-21342 saw the implementation of a much better lockout system.
It was suggested that it be considered for backporting - this issue is to make that consideration.
Please if you want to see it go back for this issue.
Feel free to share your thoughts as well.