Fails on x86_64 and target. This reverts commit cea28ec4. Change-Id: I30c1d188c7ecfe765f137a307022ede84f15482c