Revert "touchlist updates from chapstick master"
(wrong branch)

This reverts commit 317be0ba897b341acc0bd670fc845e4d2b81a3de.
rename normalize