Follow-up r73270. Moving the attribute check down to the point where it's for sure...