Reverted to using builtin ast nodes