2368 /* XXXX: vendor workaround functions */