Hack for the demo with the THT templates

Change-Id: I878b55fd2a8709ff787256763b30bf9841d76983