Created attachment 78786 [details] [review]
Rework PV

Sorry, I tested previous patch and it didn't work.

However this new patch should fix gears, and probably others tests too.
(Apply it on HEAD)