Remove workaround on highlighted items

Fixed by #1902 in Cappuccino.