9919ce3 removing silly not-quite-functional header style hacks