#37668 is a risky endeavour for a point release so we should make it easy for folks to remain on the older loader code if they wish to do so.