Revert "Fixes #4613 for real."

This reverts commit 8b839a802800be497c30a118d22d3f878b207f37.
Revert "Fixes #4613 by omitting tokeninput callbacks on edit."

This reverts commit 0628ac8bd78224bb5d181e016a70fe4c191c7764.