Reverting some changes on the last commit that was not needed