We should also be doing this irregardless of vcl backend

Change-Id: I46ec2c654dfd9ab3c6bcf6da19e7ffa2c05890b9