Revert "broken: do not merge"

This reverts commit 1706e720b7582a593e59c0a5cc5aec8f9f6d683b.