Revert "Fix compiling errors"

This reverts commit 02843cf25dbdd09fedf817bcbab7229974d77b27.
Fix compiling errors