Revert "Fix move choice validation" for now

This reverts commit 59ae64f840de4b5d0e2d2ebe80f0ce4303dd6283.