Revert "More fixes"

This reverts commit b874f629240ea71905189c0301a0258c4b990ba5.