Revert "handle early ends"

This reverts commit ae5c358c1d39a620eacc3b7d9ed159394facd572.
0.3.2