Revert "Fix compile error"

This reverts commit 960c79f205aedd2a962ac37aaf70a5e34c9c3263.
Attempt new compilation fix