Revert "Fix clang compile time error"