This reverts commit 7711eb75851df0dfcacecab5199bec5cff528ce8.
This makes no sense as control types are _not_ macros.
(cherry picked from commit 74ba8ca7521d0dd984db899b7517e89a8737bc8d)