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

This reverts commit 8603738a89a90802349b8563a031cbd6f0dd0443.