jf: Remove Vector hack

Change-Id: Ic0a7640d9f54a027fe350a08dac4dbf0e883371c