Revert "TEST hehe"

This reverts commit bb91576d2457764826582ff08a5c376bcec7b2c0.

addshore is doing weird things..

Change-Id: I06d4c2d17d9be7ca8e52a2fc622e23ecb4138610