Since we need to do some manual work for this PR anyway, it might be a good idea to empty this default value?