Speed things up

Change-Id: Ic0e1cf9ace3e863ae58868887e5edb6006f0f2a3