Yeah, I'm planning to address #1265850 in a separate patch.  This patch only addresses #1263310.   Lines 6 and 7 here are basically what the static file did (which works for the initial installation at least).