Fixes #5499: Rewrite initial promises to use normal ordering on 2.11

There is a different PR for 2.6, 2.10 and 2.11 as they must not be auto merged