Backout Bug 1082652 for causing integration test issues.