Use WF 8.1.0.CR2.
Remove JSF workaround.