Ultimately they should be unnecessary now that upstream's fix has been in place for a while. Removing this reduces our own footprint, and gets rid of any possible unintended behavior.
