Fixed the chaos generated by the last devastating rebase