Reverted files to fix cop spawning issues