Apparently, this bug is fixed on the PTR running 5.4.2 (haven't tried myself but a number of people are reporting it), which goes live this week. So you may be able to remove that temporary fix soon, will update when the patch goes live over here

(Was about to post it on the main thread on the subject but figured bumping an old announcement will just confuse everyone, so posted here instead )_________________EU-Draenor:
-- Sagart - Buinne - Eilnich - Ruire - Laidir - Tairbh - Balgair - Naomh - Dubh --