Remove hacks after incorporating 8.2 WF component bugfixes