squash! !UPSTREAM: Fix ATTRs.  Not working yet.