This reverts commit 490dae26. Bot is broken, seems like there is a problem of ambiguity in the parser.