Comment 4 for bug 1756110

Thanks Galen! I verified the changes in the resolved patch didn't break the dropdowns in 3.0 and backported the patch.

There were even more conflicts for 2.12. Since the dropdowns are still working as expected in 2.12 at this time, I've opted not to backport it that far.