Revert "TS-2082: fix build with --enable-standalone-iocore"

This reverts commit 94215bf293d76d27a88a0fc9e35356321310fbf5.

This broke some cache regression tests and we are reverting it until
those can be addressed.