I know you didn't add this @rootlesstree, but this is weird.  @larsmans - the ``git blame`` says you committed this ``if False`` block.  Is there a reason to leave these two lines in?