Remove this for now

Change-Id: I0040c6c8174bde63da00aa366c908acf16e7888c