Sadly yes; ripping this out will be another bug because it means that we can't have multiple-template publishing. Which I'd actually have no problem with removing! Just that it has large repercussions.