This seems fixable but not in a trivial way from what I could tell. Signed-off-by: Matt Moyer <moyerm@vmware.com>
-short