Revert "Fix compiling errors"

This reverts commit ee1a4564fe595aff449e5564db7932195b84a288.