[2.063a] Issue 10134 - Mutual referencing templates error

http://d.puremagic.com/issues/show_bug.cgi?id=10134

This regression is caused by merging #2026.