Back to JSF annotations after having problems with CDI.