Revert everything whole source messed up, start from scratch