Breaks valgrind. Bug: 29462018 This reverts commit 8e2c5625. Change-Id: If58cedcee75dd0eda8571e90d63e080a4709d773