Reverting some of the code changes from the previous commit