revert: remove to allow other branches to go first

There are logical conflicts which need to go in order.
Merge topic 'dev/backtrace-performance' into next

9e97d67c revert: remove to allow other branches to go first