Reverted back to an implementation that "just works", got lost in the details.