Revert "Second attempt, unresolved external symbols"

This reverts commit 2bec85cd9f8148e09a7f69840e4724aa7a41d562.