Revert "Intermediate commit."

This reverts commit d22f4892ee95d15dd9c3d3642beda326b2ce99c4.