Trouble retiring package on F21 branch