@@ -332,7 +332,8 @@ def __call__(self, **kwargs):
 
             kwargs.append((param.name, param.default))
 
-        __call__ = make_function_with_signature(__call__, ('self',), kwargs)
+        # __call__ = make_function_with_signature(__call__, ('self',), kwargs)
+        __call__.__signature__ = sig
 
         return type(str('_{0}BoundingBox'.format(cls.name)), (_BoundingBox,),
                     {'__call__': __call__})
 
@@ -11,6 +11,7 @@
 import textwrap
 
 from .introspection import find_current_module
+from .decorators import deprecated
 
 
 __all__ = ['make_function_with_signature']
@@ -24,6 +25,7 @@
 """
 
 
+@deprecated("3.1", "This function is no longer needed, directly use `inspect.Signature`.")
 def make_function_with_signature(func, args=(), kwargs={}, varargs=None,
                                  varkwargs=None, name=None):
     """
 
@@ -9,8 +9,8 @@
 import types
 import warnings
 from inspect import signature
+from functools import wraps
 
-from .codegen import make_function_with_signature
 from .exceptions import (AstropyDeprecationWarning, AstropyUserWarning,
                          AstropyPendingDeprecationWarning)
 
@@ -84,7 +84,7 @@ def deprecate_doc(old_doc, message):
         old_doc = textwrap.dedent(old_doc).strip('\n')
         new_doc = (('\n.. deprecated:: {since}'
                     '\n    {message}\n\n'.format(
-                    **{'since': since, 'message': message.strip()})) + old_doc)
+                     **{'since': since, 'message': message.strip()})) + old_doc)
         if not old_doc:
             # This is to prevent a spurious 'unexpected unindent' warning from
             # docutils when the original docstring was blank.
@@ -834,72 +834,6 @@ def _make_method(func, instance):
         return types.MethodType(func, instance)
 
 
-def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
-          updated=functools.WRAPPER_UPDATES):
-    """
-    An alternative to `functools.wraps` which also preserves the original
-    function's call signature by way of assigning the ``__signature__``
-    attribute with the signature of the wrapped function.
-
-    The documentation for the original `functools.wraps` follows:
-    """
-
-    def wrapper(func):
-        func = functools.update_wrapper(func, wrapped, assigned=assigned,
-                                        updated=updated)
-        func.__signature__ = inspect.signature(wrapped)
-        return func
-
-    return wrapper
-
-
-if (isinstance(wraps.__doc__, str) and
-        wraps.__doc__ is not None and functools.wraps.__doc__ is not None):
-    wraps.__doc__ += functools.wraps.__doc__
-
-
-def _get_function_args_internal(func):
-    """
-    Utility function for `wraps`.
-
-    Reads the argspec for the given function and converts it to arguments
-    for `make_function_with_signature`.
-    """
-
-    argspec = inspect.getfullargspec(func)
-
-    if argspec.defaults:
-        args = argspec.args[:-len(argspec.defaults)]
-        kwargs = zip(argspec.args[len(args):], argspec.defaults)
-    else:
-        args = argspec.args
-        kwargs = []
-
-    if argspec.kwonlyargs:
-        kwargs.extend((argname, argspec.kwonlydefaults[argname])
-                      for argname in argspec.kwonlyargs)
-
-    return {'args': args, 'kwargs': kwargs, 'varargs': argspec.varargs,
-            'varkwargs': argspec.varkw}
-
-
-def _get_function_args(func, exclude_args=()):
-    all_args = _get_function_args_internal(func)
-
-    if exclude_args:
-        exclude_args = set(exclude_args)
-
-        for arg_type in ('args', 'kwargs'):
-            all_args[arg_type] = [arg for arg in all_args[arg_type]
-                                  if arg not in exclude_args]
-
-        for arg_type in ('varargs', 'varkwargs'):
-            if all_args[arg_type] in exclude_args:
-                all_args[arg_type] = None
-
-    return all_args
-
-
 def format_doc(docstring, *args, **kwargs):
     """
     Replaces the docstring of the decorated object and then formats it.