Revert "Merge branch 'BTtoUIconcatenating' into master_stable"

This reverts commit c2b3800b3fdc9466d5564027ea150125f8d1c6eb, reversing
changes made to 8d71d9941f62eb0fbfa1200b4b3a42babc19c7cb.