Revert last commit.

This reverts commit 1023274b99100f8d8da92a25411706dc6eaf40b2.