Removes another crate dependency, and it's only used in one place in the code. Will eventually pick up the TODO and cut more bits off when I get around to it.
