This doesn't seem related to the new functionality -- seems harmless, but can you say why we need this?