Was not liked.

This reverts commit e4ddba2b.
This reverts commit ab092bdc.

Change-Id: If2e9e032a135530da92b5bd166f5b559b10b0b91