This commit should be reverted once we are confident that provisioning and the consumers work as expected.