Undo unnecessary refactoring causing issue in production.