Undo #1384 and apply it on Crubit instead /o\ (#1387)
Undo #1384 and apply it on Crubit instead /o\ (#1387)


bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration,bazelbuild/continuous-integration