Another attempt.

Signed-off-by: Ryan Moon <moonr@google.com>