Revert changes for DCSFEEv2