revert commtrack merge for now