These changes were actually recorded as needed for
vm/e2k-builder but let's put these into a common base
for the win.