Intermediate commit, broken trunk... Before the refactoring.