Revert change made in attempt to fix puzzling test failure at the builder. Real cause was duplicated ThisNodeExpression typeof rule.