Add workaround for upstream nova bug