This reverts commit 3c6df48cbc. Change-Id: If31494ccbce3aeddff0de6a28651a70a3e33dc65 Depends-On: Id7230198583355a83b1ee4acef3da7cde7118794
3c6df48cbc