Swap the cleanup and the hacky blocked indefinitely pieces
Swap the cleanup and the hacky blocked indefinitely pieces

ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake