AERGO-539 Think attribute rewinders are finally done.