Reverting changes made on my other patch.

This reverts commit 437c1860df416e3bbbfab49aefea289e3c4b3ad5.