Undo some changes made in order to make testing easier...