Accidently reverted ast pull request merge