Fixes #5460: Rewrite initial promises to use normal ordering