Actually fix the PrefPane.
For real this time.
We're slowly whittling down #9.