Revert to changeset 05c31c03a8dd.