Unmerged updates for opentelegram/hoisted until it's updated.