Revert "commit 7 fetched into gerrit"

This reverts commit be966573b02abae0179e2c201e6827cda5ea08bc.

Change-Id: Ie6eac57a912e18084a903c9ee9c53d4f1a0d5d5a