This reverts commit ad1fae7df4 and 695533d435. Change-Id: I548f15055417453a7fd323a481ed410598830521
ad1fae7df4
695533d435