re-enable missing options lost in the merge