DCHECK failure, need to investigate This reverts commit 6b10c9b2. Change-Id: Ie1d1cc6fb71367bc5ac5d6a260af8de316a758dd