Is the Plain processor dead now? If so we should remove it completely.

If not, I'm not clear why this needed to be changed. (Also, wouldn't that have made this code buggy?)