Revert "Bug 940647 - Move bookmark creation to operator variant app"

This reverts commit f6f5eededb5c0646f7791d8d4b9d646203d8c89c.
Merge pull request #23524 from qdot/revert-940647

Revert "Bug 940647 - Move bookmark creation to operator variant app"