Revert "Type changes."

This reverts commit f096a43b7c3f5eab5a30878e8e0d49b02dc7998d.