As this helper is deprecated, all changes must be reverted.