This reverts commit 5ce8a93ebb7688c66bd08fa27d2e04bca33b6763. Commit 1bc58a258e2edb6221009a26d0f0037eda6c7c47 was reverted in a9a8351ef181610559687679a40efe24649f9600, so the bazel fix is no longer needed.
This reverts commit 5ce8a93ebb7688c66bd08fa27d2e04bca33b6763. Commit 1bc58a258e2edb6221009a26d0f0037eda6c7c47 was reverted in a9a8351ef181610559687679a40efe24649f9600, so the bazel fix is no longer needed.