This is the "old" code that will go away in the future, so I didn't see any reason to touch it.