explictly unset pin_was_locked_out instead of implicitly (bug 887862)