Switch back to upstream tcomment; PR merged.