Committing changes needed for the 1.2.0 release build. Removed addition of compat...