Revert some changes which I don't make sense of