This reverts commit a6fc36d4cd. Change-Id: I6b96afe4a32dc894d5b17cfb870b45063257aed2
a6fc36d4cd
1a4527ce