And fix Ancient Shadowmoon Spirit position (cherry picked from commit 7f098196a1cee0d60956ba965db211646ab1579f)