I'd be interested to know if this fixes the revert in #937 for @andersonamuller