Revert "Optimize Deferred execution (#1805)"
#1821
+214
−655
Closed