Revert "Fixes for errors posted on facepunch"

Just to avoid conflicts. It's now on the experimental branch.