fixing case where a false-like value is passed into a SET clause

(cherry picked from commit 89f71d594ace29cdf6f9e9435e941a34ee052fab)
removing extra, unused param

(cherry picked from commit a7c79972defa819c32a3a53417d3db52e0e0d7d2)