This reverts commit a65ab425. Reason for revert: Breaks Ryu build Change-Id: I57c760b561cbbfcb1f0191e8309fc678461dba36