Backed out changeset 9281f9896ce0 (bug 1048098) for webapi test failures