Revert the last two commits (for now...)