Restore old behaviour of autoparsing