This reverts commit 794bff5f. (cherry picked from commit 8ace610a) Change-Id: Id53d64a04aa8766a2cb283a2f7b8354590213b13