Reviewed r/1784 and reopened bg 1026165