Backed out changeset: revert to HM-based weightP