Unset enable parameter instead of set its value to false. Fixes #1838