Revert "Merge pull request #12094 from borjasalguero/oslo_bb_fix_actionmenu"

This reverts commit 723e8490aa8240ada5f56f6aa8ee210fde5d11d1, reversing
changes made to da4cb0c60f61e112c4299444d4846485499721a4.
Revert "Merge pull request #12114 from jaoo/883298"

This reverts commit da4cb0c60f61e112c4299444d4846485499721a4, reversing
changes made to 8e5de39f0a8faec1c2f2b7496343e5bf204a9799.