Migrate ephemeral disks

This is a fake pull request to make my change a bit easier to review.