Revert^2 "Adoption Custom tokens"

This reverts commit ce1426c12a30323b54e40bc452e22bad428f2d92.
Reason for revert: Fixed Original Breakage

Screenshot Dark: https://screenshot.googleplex.com/9hPv3PtCHRUfreb.png
Screenshot Light: https://screenshot.googleplex.com/7biwMqNmp6eYDzS.png

Test: presubmit
Flag: EXEMPT bugfix
Bug:  327348461

Change-Id: I33dcce3ee5db8fde3de9330e433a1d9c6113d1ec
4 files changed