Revert using body so the root have a clean state
Integrate fix proposed by @adamdicarlo on the LM adapter