Pre-refactoring checkin