Revert "Merge changes."

This reverts commit edeec466ff2ed42ded115463b056393163f11b84.