9173be686c
* Swap in new package, update usages * Remove uneccessary patch * Override type in safe place
* Swap in new package, update usages * Remove uneccessary patch * Override type in safe place