Template reverted. :( One more inconsistency to handle and hopefully somehow solve