Practically, is there any part of this PR you'd be interested in salvaging, or another approach you're open to? Otherwise we should close it.