Change that triggered this got reverted. This "fix" needs more investigation. This reverts commit 1ee29d3d. Change-Id: Iee9e88f0e993edc0c7212e36d48ded1d31209156