Revert 92fab91..100d0a7

This rolls back to commit 92fab918cdb9dc9e8e3bcad233edb77939f5bf5c.
some XP farming and tool upgrades