Crashes in some configs. bug: 37693252 This reverts commit a30183df. Change-Id: I356d397a3f3e29fbef510f48c1c7633677ca5e78