Issue #3133318 by bradjones1, SpadXIII: Revert #3058063 - Regression on form rebuild and wrong decorator pattern