Revert "This is shamu :)"

This reverts commit 7a0da204cb81bfe67f80df1480066eef0c30bf46.

Change-Id: I0c092dcdd7457cfb6fd793b9b3e773ebe2a54eac