Revert "bringing in months of changes"

This reverts commit 74586f5afb859fcce5b82b5469a0e663ed548739, reversing
changes made to 52e3b4c2d9f5b9bbbd7dc70fb6cf427ed454a6b6.