Revert some changes in previous commit