Remove hacks for "text" format.