add back previous const propagation restrictions