[packages] shadow: revert r36612 and use r36574