Revert 3.3 changes. Think of future versions >3.3