Revert last two commits. See #271.