Revert last two patches.

Signed-off-by: Daira Hopwood <daira@leastauthority.com>