NEXUS-6537: Simplified move, assume we can move, and fallback if not