Moving to earlier raw-body for 0.8 testing