Revert "umbrella was breaking two droplets bug fix"

This reverts commit f38b23ccfb691b834860eca810023be665566e41.
Revert "Revert "umbrella was breaking two droplets bug fix""

This reverts commit 28d692abcc18341256b7e57615fdfe57c8ed2d0f.