Revert "Shift some things around for fault tolerance chunking."
Revert "Shift some things around for fault tolerance chunking."

This reverts commit a63bd7c9555a9ac10845f2533f51deb011c9e2e3.

KevinGreene/onyx,onyx-platform/onyx,dignati/onyx,intfrr/onyx,ideal-knee/onyx,iperdomo/onyx,mccraigmccraig/onyx,tomasu82/onyx,Deraen/onyx,vijaykiran/onyx