Revert "more fixes"

This reverts commit b3dc2e8e1c3e5239bc99f5192f28dd471795711b.