Merge "Revert "Disable block migration explicitly""