Revert "Update history to reflect merge of #2596 [ci skip]"

This reverts commit 22af1f07bf05169dee6a9e4feb4099dc15ae9aa4.