Revert "more fixes"

This reverts commit effd322541550a800b5544a05bebb0225c55e6f6.