Revert "Fixed build issue when building in release mode"

This reverts commit 57fc0b5f1f3e73655e469f268cfc3ead182e239e.