Fix vagrant regression

(cherry picked from commit 1a894741b24dcfe621e998380a098ef0d592ee81)

Original PR: #2489