This commit reverts unacceptable change introduced in driver: Fix and refactor of FCSI and EWLI handling