Reverting some changes of last commit