Proposal to fix fs#314 (perforce #6159)