Revert "just some simple patches to get everything working again."

This reverts commit 9521c63b4b78696262f0104ce4bf036e1d660696.