revert-2273-replace_tags_b_and_i
master
This reverts commit 216dd66aba35d64fff79e62ed317a7fa317bb8af.