Revert "Refix #293. Only replace the left angle bracket of '<xxx-xxx>' style."

This reverts commit 1cdbb4bc40d5b5647c1da8eef6d0908840a95b04.