Reverted this fix in master, rel_3_0 and rel_3_1 because of problems reported in bug 1782401. Sorry for the confusion!
Reverted this fix in master, rel_3_0 and rel_3_1 because of problems reported in bug 1782401. Sorry for the confusion!