With #745 this problem becomes irrelevant anyway.