Comment 14 for bug 1847800

Works for me! Pushed to master and rel_3_5. Can probably be backported to 3.4 on a site-by-site basis, but decided not to push it to rel_3_4 since there were code conflicts. (Happy to sign off on a 3.4 fix if someone wants to work one up)