It only really existed to make unit testing easier back in the day, and is trivial to move to its two callers. Change-Id: I06c4408995d4bad0a4560e8e9cd5298d4bb6b043