Revert "all these things that changed - testing."

This reverts commit ba252d830e2ed8a327ae6e0bfdf92a4fb4a94ea5.