partial revert HEADsup fix