Modify to build with no help from internal TH build