This should be reverted as we do not trigger errors for things that will be removed in 3.0 yet.