Removed to much

Change-Id: I56b67b8cf80b32bebef9dbb3522fef33f8238621