backing out changes to fix warnings as they trigger errors on linux build.