revert some build warning fixes.