This reverts commit 315a4070. The new test added fails to link the unit tests correctly and breaks certain buildbots.