Oops, legacy of an ancient refactoring