Revert "Build Error Fix"

This reverts commit b46939c2c7dc205c67a280a9d29d022ece3701db.