One more attempt at fixing broken D.O packager.