BUG:479084 BUG:482653
This re-introduces the workaround that was removed by Marco in 6a61a56bcd
6a61a56bcd