Fix failing munge_tabs test

I'm still not sure how this was reverted, but cherry-picking back in...

@jrbl