Bug: 24618811 Too many failures on goto/ab This reverts commit 54c4e0d7. Change-Id: Ic6305c14d78b38e5c13ea42e1777ad197ff2f45c