Revert to version before TkTech's contributions