Revert "Reworked body allocation"

This reverts commit 6cfdf2ff6ea21a8fa9bb1b227b7913037ed0b5bb.