I can't reproduce this anymore - since it is an intermittent issue, I believe we should leave to AGPUSH-1512 to fix this properly.