Remove old widget hierarchy hack that caused problems (#11752)

Change-Id: Icd66755512a2c1ab490e58f80389ed35966d3e3b