Removing original files used during port to '2-1-stable'