Self revert r89797: At least the block log link is wrong. I should not commit when...