Fix commit history.

This reverts commit 10f28588aaf743abcab9748fb44deeafeae455d0.