AC-1040 Add back a few attributes for backwards-compatibility.
AC-1040 Add back a few attributes for backwards-compatibility.

snahelou/awx,wwitzel3/awx,wwitzel3/awx,snahelou/awx,snahelou/awx,snahelou/awx,wwitzel3/awx,wwitzel3/awx