Revert "Merge branch 'refs/heads/topic/custom-attr-rewrite' into ait-qa"

This reverts commit 5fdd974288b63e84b203caebc6159a9aebb893a4, reversing
changes made to 97176d2c722203fcc0301b33c24a322e9570e941.