The problem is that leaving this here always results in a "template not found" exception, since the logical template name cannot be resolved as the demo bundle is only registered in the dev env.

But this leaves me to another question: shouldn't we revert this change and register the demo bundle for all env?