Remove the default attributes.  Instead, encapsulate the checks in a function.
Merge branch 'skip-cephx-if-disabled2' into cdmaster