Restore headers for #1245