Revert "Fix the build broken by r189315." and "Move everything depending on Object...