Revert "Fix late template parsing leak with incremental processing"

This reverts commit r219810.

The test suite appears broken.