Comment 45 for bug 1574982

The patch in comment #39 or the env var in comment #38 both work for me. Thank you!