Upgrade to CDI API 20130121