This reverts commit 8c3af4aa8c. Reason for revert: Broke Master Change-Id: I37bceeea630fb7db39efa25d03ababe3d84cdfbf
8c3af4aa8c