[thanos-bounce] Partial revert of 519418
[thanos-bounce] Partial revert of 519418

Bug: skia:12544
Change-Id: I19b37032c1ed112b90944d0bbe4fc99c545de030
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/519656
Reviewed-by: Joe Gregorio <b9cf2471ff6d33504cafe8e6f356b732b2cadced@google.com>
Commit-Queue: Eric Boren <0e499112533c8544f0505ea0d08394fb5ad7d8fa@google.com>

google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot