Revert "Add support for rebinding type definitions"