Check in a working shadow impl, breaks dynamic super