[packages] This fixes some problems with commit r16438.