Revert last Apple Interface update: only use the macro workaround