Switched to different implementation of headers.