This blocks bug 103244 and bug 73002
I'm not sure this is needed anymore with the new parser architecture.