This reverts commit 5411637a845005a46a3bb80ffd13fdfa34de0792. Change-Id: I08ca89a52689ae1c9e194aa014ceee7c1d636990