Roll back deprecated annotations (probably not wanted by junkdog).