Revert "Fix BodyNode."

This reverts commit adbe5200b2ac6576c6e8da76ed295619db86b4ce.
Revert "Reapply from master branch (4234340323b55fcc90137e3d8292426b7a6e834a)"

This reverts commit f23f3926d709cf4fa6829785d22f19175cb1e07d.
Revert "Revert "Fix BodyNode.""

This reverts commit c7f6ba6c70e2fea88a2eb18ae939b3d36ad083cc.