Merge "Revert "Add more debug information.""