Revert last two changes

The problem seems to be elsewhere