Reverting CoFH/TE3

Unfortunately there has been an API change that has ended up breaking more than is fixed until everyone else has a chance to update.