Revert "more fixes"

This reverts commit d1399fd3966a2018ebcd390eacb6ac2b8c03ae50.