Undo some of the hacks to make receipt rendering work.