Adapt to new 2.x protocol

Change-Id: I2bec860a36098d9a6c983b03e695def508258f05