Reviewer says: enable as default