Revert the last two commits. This needs some further thought...