Try harder to work around ubuntu package bustage.