This reverts commit 442a72d9.

Doesn't make sense.  No idea how my local compilers where happy with it!