@bspitzbart - it looks like you started adding an entirely different patch, which is the SCS107 lockout.  It's really much better if you do one functional change per pull request, particularly since the original was simple and didn't really require testing (vs. this update which will need to be tested).  Maybe including this update was accidental?