Are we sure that this doesn't break Blue Eagle (and other existing templates)?