This reverts commit 3703206a9c3792c19c759679fc1fb107a0451cbe. Change-Id: I4c56ddc60e7ebbf82d6d4a3ac792a2580f3ba261