Revert changes from ymattw's patch entirely

Needs a completely different approach once exact purpose is determined,
requirements etc.  Sorry Matt: don't take this personally.