More sane header for unstable branch