Revert "fixed compile issue with previous fix"

This reverts commit eac153ff8ab322f1bbd8c2c11e31ace2b9ae0fb7.
Revert "Another potential fix"

This reverts commit 286706bca17739a90ad48ed8b328c50382593953.