Fails on baseline/x86. This reverts commit 38207af8. Change-Id: Ib71018367eb7c6046965494a7e996c22af3de403