Bug 5030/invalid promises generated for distributepolicy as of 5025