Revert "More fixes"

This reverts commit d3fdd9047316745fe2e2e4bd21454bd1fc9667ee.