This code prevents one example of a class of problems. We'll need to think this aspect through carefully before merging.