Reverting temporary change Iedb304f8 as promised

Change-Id: Id2d0e2242cfb3fe84b68c5bfb8ab7c74fdf92f7d