Restore -skip-headers behavior

f0f56f2f710349dbd5eaa6efae02b95418005981 removed the branch that `-skip-headers` enabled.