Ah, saw this too late. Also see 2aa0841940d309b858eed5bc156262a7d90c949b