That code was not used, not even in the tests. mamueller wrote it, I just wanted to keep this PR simple, but left the code commented out in case someone wants to keep this code.

Beware: I have not checked this code yet.