Remove hack that was needed to cope with our old asset tagging but