Revert "Simpler transition between preflets"

This reverts commit e2d6f5f5d51681be01f985c01341ec9777e78e4e.
It doesn't buy us much performance.

Issue: #17