Updating VSX's patch to work against revision r190584.