r12650: Remove support for NULLTERM flag (is already covered by tridge's