Revert changes in Vivid to prepare release 1.8.10