Reinstate vivid changes after 1.8.10 release