Rerevert quad vectorization

Change-Id: I60b33c0872c857fb3d9ec74bc6949fae09456315