[noticket] Fix issue where we appear to have bad extra data