Revert "Double patch: CM upstream fix + Fill method body back"

This reverts commit 99de849487c078b1b006075da588be811b8c571a.