Reverting the changes done to this file for coverity fixes