You should add a TODO that this needs removing once we update the BOM to use DeltaSpike 0.4