Prepare for snapshot 6.