This reverts commit 3d0d4c6e. Reason for revert: Revert temporary commit. Change-Id: I044b3ee9c9d1e4f7a8c4c5a782c38581cc065d5f