e197d27c8d
This is in preparation for the subsequent commit adding test case for the prefs functionality to avoid building the code twice.