Apply attribute fixes from backend revert, refs T1064