Another attempt to fix release build.