Fixes #5460: Rewrite initial promises to use normal ordering
Merge pull request #475 from peckpeck/bug_5460/rewrite_initial_promises_to_use_normal_ordering

Fixes #5460: Rewrite initial promises to use normal ordering