Revert "[Bug #8467] Resolve conflict"

This reverts commit 4d360ae351e426d338db81f2c8b96b397ee2e6a4, reversing
changes made to 2cc68ec03b089b83314261a881e993cb53a38004.