Revert "more fixes"

This reverts commit 0c70e1c917ebcc6bc8570798869d5febfe4857f9.