Backing out bug 98c4c4a55139 for numerous test failures.