Revert some changes temporarily