Revert "Merge branch 'istrasoft-PR-dropdown-fit-bounds'"

This reverts commit feb991b977c0185e6947731945cdd000c2b97e33, reversing
changes made to 429b8e8b02a438bd363c6867fa02b2a4fad53285.