My partial reverts of things appear to be creating bigger mess. [SVN r56042]
@@ -1 +1 @@
-Subproject commit 55d7da0de13fa2c250acde7269e858c51a5eada5
+Subproject commit 2674d67c7276f93602a0e4d8ca4039fc1f76b563