This reverts commit 618acf5b12.
618acf5b12
Change-Id: I8f2ff0b687020a9df0bb033088daa51a7ecd3c83 Updated per review comments Former-commit-id: 4ddd7491140b62a93b85e63ff02a51369e150c11