This reverts commit bb9333c3. This exposes another existing bug that causes an infinite loop as shown in D110170 ...so reverting while I look at another fix.