This reverts commit d44827a4c5. This broke master due to a race condition in our presubmit queue.
d44827a4c5