Temporarily rolling back my last change since, though it makes the app
work, it breaks our tests.