tk of magic words
Revert "tk of magic words"

This reverts commit 1124bee135ae8829261ce0331842378cfbc8ab7a.