Revert incorrect merge.

This reverts commit d97ae66d4f10f95cd1ab10d233f704bc31e011e9.