Partially reverting recent commit on 'Working on #864: hpx::type_id should be a template'