Back out the defaults change I made earlier, because it had side effects I didn't like.