Backport bug fix from pull request #803 to earlier conformance suite sna...

...pshots.