Ensure CONFIG_PROVISION_* variables always get set

Also removes some now-unnecessary checks.

Change-Id: I19cc2ba4a9b733a78648d9f58f0f1538442d574d