Revert unwanted changes.

This partly reverts commit 8b1d2b2fe1b9c4a3d5cd30a73238ca20085049c5.