This reverts commit cd73a72ce9. This did not have the intended effect and packaging can't be found in some cases.
cd73a72ce9