Revert stacking code for now