Adapt to upstream changes in Hangups