Patch Set 1: Do not submit

(1 inline comment)

Thus far I've only reviewed enough to block this because of the removal of an important safety feature.  I'll review more critically and give better comments on the rest of the code.