revert 0b28202e as #755965 is fixed with cdebootstrap (0.6.3)