Originally fixed in 6cc61605, but a regression was later introduced in
519a19a9.

--HG--
extra : transplant_source : e%B0%AA%A0O%D0%06%1F%90%17%9C%0B%B3KN%84%17%E5%19%81