I'm mildly amused that we added all of this in a prior pull request and are now pulling it out. =D