Fails gcstress configuration. This reverts commit c669beb7. Change-Id: Ifac92471f91a116fc271d0dde8356fbbb0a08048