undid the refactoring for today's drop