Remove usage of VP See merge request !590 (cherry picked from commit 0b6154bd) 74591341 Remove usage of VP