Reverting a bad commit.

This reverts commit 41a6b18efcadcd4e5384bfa29263807fddcb0122.