Oops, forgot to get rid of this with the recent refactoring