Revert the linkage fix.
I got a bunch of buildbot failures that i don't understand - sorry.