The rename is not needed either, since we're not adding more code as of
now.
This reverts commit 57ca011e.

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>