Reverting bad commit

Change-Id: I0520c1abfd46537032e3a068b10e781fa2f3d7be
Signed-off-by: Iain O'Farrell <iain.o-farrell@sap.com>