Revert "SE761: Merge conflict hopefully resolved"

This reverts commit 5126a13646a965cf5c79c6f8d80e539755bd614c, reversing
changes made to 1ff2f02d781ff579152643a8987720cedf5675e0.

Reverted the broken push. Made the campaign shorter.