Revert "Another try for ghost fix"

This reverts commit 982e3824800ecabbb5effe1b674eecebdac415f6.
Revert "Fix ghost move problem"

This reverts commit 3c653aec087c87e7a1e0fb6f4763c21ad653c9f2.
Shadow moves fix