Re-default attributes to properly account for overrides