Backing out cec68e2b, was causing serialize tests to fail. Un-fixes #5566.
Attach a file by drag & drop or click to upload