Revert fad4189..361e670

This rolls back to commit fad4189f6d01c561ffaf3f05817bcc9bdcef34ed.
Revert 361e670..9ea36dc

This rolls back to commit 361e670156014413782448de06c211ab078fd794.
Dropdown aweomse