Remove #19 change; it is broken

The change in #19 causes really weird behavior all over the place. We'll do this right later in #23.