Revert "Reorganise pack tasks"

This reverts commit 265491e9104ba64af59367b74b04f31a1efa1571.