Undo billing config re-mapping (bug 958465)