Revert all commits by gordielachance, they were not well tested