Partial revert.

Revert.