This reverts commit 9af663b59f as the root cause was addressed in I49734fbf4c3499e148367c9b6dd6f4f49ba17956. Change-Id: I47c1842fcb19db57551348d38594ea09de802e57
9af663b59f