This change seems unrelated to the proposed change to PREFIX. Did you intend?