CDI is a nightmare

Change-Id: I7e7f8769427aa0b0756c2f20f9a5d5657019026b