Revert "Further minor improvements to using IS_IN_SET to force a checkbox to be ticked"
because it keeps coming up in pull requests

This reverts commit a622354120f6045d8157dd8b61b9ed8e02869da9.