move PR1604 here.