Fix body-dropping in an inelegant way for now.