Revert "linker fix - try 3"

This reverts commit 7f42fb7cef5a834d73e32e1a3ae4114aa768276d.