Revert f9cd504..0b6befc

This rolls back to commit f9cd504b86ff2c2750b5c360b602800d22ae03e3.
Revert 0b6befc..b6edbe2

This rolls back to commit 0b6befcc43c854c1e17321ecae735cb0cc895788.
old dropdown is back