Removed previous changes, since FE dependencies changes and they where no longer needed.