Take 3

This is no fun, since I can apparently only reproduce the problem
I'm trying to fix in the course of a jenkins build. :(