Backout changeset c8cd1f6b6d2d because it's not web-compatible.