The test from pull 2347 has crept in here too. I guess this will produce merge conflicts.