Revert "TAP5-2260: Add support for CDI"

This reverts commit db68d5b9bb5069d4ee3df9fc88904e4e1da85de8.