Revert "Improve handling of RenderAttribute overrides/additions in Draw APIs (#1732)" This reverts commit db71195c4669b0dc2d9e3e6e9dcabfab0067a9bf.