Revert "Finish fixing migrate-cma.c."

This reverts commit 529f83e5c00c8c8e46f5c45b125de603c33b8b6e.