revert additions in edisz-dev_ms_branch

sorry for the failed merge...