Revert "Refactor: do not construct Vaquero many times"

This reverts commit 3ecaa87525e4969c8c6399e0749839b7b0c41622.