diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
index 0d700bac4204caf03c308c6d70a304aa363f4336..513401d1962877000e47c9c1e89fe8cc89dbd766 100644
--- a/indra/cmake/LLPhysicsExtensions.cmake
+++ b/indra/cmake/LLPhysicsExtensions.cmake
@@ -9,7 +9,7 @@ include(Prebuilt)
 # - The prebuilt package available to those with sublicenses, selected by -DHAVOK_TPV:BOOL=ON
 
 if (INSTALL_PROPRIETARY AND NOT LINUX)
-   set(HAVOK_TPV ON CACHE BOOL "Use Havok physics library" FORCE)
+   set(HAVOK_TPV ON CACHE BOOL "Use Havok physics library")
 endif ()
 
 
diff --git a/indra/newview/VIEWER_PROJECT_CODENAME.txt b/indra/newview/VIEWER_PROJECT_CODENAME.txt
index 7d982273430ca6ba1ffe921b2e507f7e5fbdee38..85feca4d4c13967709e79a8d823dab3b77051eda 100644
--- a/indra/newview/VIEWER_PROJECT_CODENAME.txt
+++ b/indra/newview/VIEWER_PROJECT_CODENAME.txt
@@ -1 +1 @@
-DynamicDingo
\ No newline at end of file
+PBR
\ No newline at end of file