Revert some things and start again