Revert "Fixed some semantic errors"

This reverts commit 0c23d1db4e077a9d6d544049aa1d074f6dbef816.