Revert "Fix Build error"

This reverts commit 067d000496a22193e2a8653af853d65ed8280b11.