[aat] Update for blob changes

Also, uncomment code again, just "if (0)" it out, so it doesn't get stale again.
5 files changed