Do you intend to fix the UART and un-comment this before the PR gets merged? If not:
It would be a lot cleaner to split it to a different PR.
If yes:
Please mark the PR as WIP (via label and description).