Backed out changeset 5eebce6c8845 (bug 1091109) for webapp test failures.