This needs to stay i386 for now

Change-Id: I1ef0caa658e46be71519c6551d5db26e302db28b