Undo PRs #9 and #10

See #11 for the discussion motivating this change.