Revert "Widget Upgrade"

This reverts commit 82fc315283506126646386cb9bb45141469b8a13.