GitLab

This reverts commit 3b59929c.

Fixes the original flaky build issues and fixes a typo caught
by the previous review.

Change-Id: Ia8a008b75dba51980b064f9689477b8698bcfa5c