Revert "Sync 3 2/3/2013"

This reverts commit 440f46463465c2675ce6dcd8e173bd8ed59169e5.
Finished update.