Fails gcstress tests. This reverts commit 7aa75606. Change-Id: I4f5c89048b9ffddbafa02f3001e329ff87058ca2