Hopeful fixes to SR building process.

In other news: MUST. RESTORE. INTEGRATION. TESTS.