The change in f30a8a6f conflicted with the recently landed feature on ODS assembly format for Attribute/Type.