Do not normalise magic words

This is a bit unfortunate, because of existing legacy. I'd rather leave
the current behavior in place, but it increases chances of unintended
breakage.

Bug: 46614
Bug: 46613
Change-Id: I8f1442e1f44f6f617f33dcb7b029596744a5644d
Merge "Do not normalise magic words"