This was added but never actually used in production, turns out if it is there we have problems.