Restore old annotationparser for testing