This reverts commit bf84eb5ed579d13b74c97b995299ca61cafedea6. Change-Id: I40e311174898a741f5053501290833420355ad03