It was causing unit tests to fail, and it's a needless bit of abstraction that never should have existed in the first place.
