Revert last commit and add type hints.