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

This reverts commit b62415019bd615c804cf568c81c2c48800799cc5.