Overlay fix

[bremner]

Here's a fix for handling overlay. It adds a very simple minded test, and then reverts my previous change, which turned out to be based on a misunderstanding, and to not combine well with the changes you were making at the same time.