This was broken after the refactoring.