Proposal to fix fs#314 (perforce #6159)

As requested by Christoph Lipka on devel list.