Back out broken hack for #1538848, and comment out the errant entries in the
data instead. (New version of data not committed yet, because I'm still
sorting another bug.)
A broken fix in notationcommands.cpp made it in here too. I'm still sorting
that out also, and this code needs gutting again, but this version is only
broken in a different way from what was already completely broken, so I'm not
going to bother backing it out of this commit.