Revert deprecations for issue #41