Update history to reflect merge of #977. Repealed #580.