BZ-1172533: Reverted previous commit. Added wrappers to inject via CDI.