Preparing for vagrant/packer and working around bug #1242363