It was mistakenly re-added in 6feb729b686b902be2520a91281e1a000c055da2. Change-Id: I99a41ed8e6f1975e9808d8063e594fbb996d4334