Revert "Support legacy image for backward-compatibility"