Revert "more fixes"

This reverts commit a388888f4f99aee26f83ec624600a327ad3fbe9a.