Original version missed a spot This reverts commit c02977e3bb. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
c02977e3bb