Revert "Update Paint_Delegate following commit fc42a99"

This reverts commit 6245feff54176e9fcb8aedb560e12689599a7d3f.

Reason for revert: This change was adapting to Change I7663b927 which has since been reverted (Change I65dc9f8b)

Change-Id: Ib5ff4558a6ac1ac2b53230bdf758cee2d0ac7643
1 file changed