A ViVeTool workaround still works for now.