Revert "Merged WFU modifications"

This reverts commit 9df3ccd94e020002242403eb3a1f5828ad2e0374.