This reverts commit 6e991d0e.

Conflicts:

	lib/constants.py (this got already removed, so no changes in here)

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>