diff --git a/lib/codegen/build.rs b/lib/codegen/build.rs
index 8eae5faf94..f5dc654273 100644
--- a/lib/codegen/build.rs
+++ b/lib/codegen/build.rs
@@ -91,7 +91,7 @@ fn main() {
     }
 
     for isa in isas {
-        if let Err(err) = meta::gen_registers::generate(isa, "new_registers", &out_dir) {
+        if let Err(err) = meta::gen_registers::generate(isa, "registers", &out_dir) {
             eprintln!("Error: {}", err);
             process::exit(1);
         }
diff --git a/lib/codegen/meta-python/build.py b/lib/codegen/meta-python/build.py
index b88653822c..60fe124e21 100644
--- a/lib/codegen/meta-python/build.py
+++ b/lib/codegen/meta-python/build.py
@@ -10,7 +10,6 @@ import gen_settings
 import gen_build_deps
 import gen_encoding
 import gen_legalizer
-import gen_registers
 import gen_binemit
 
 
@@ -29,7 +28,6 @@ def main():
     gen_settings.generate(isas, out_dir)
     gen_encoding.generate(isas, out_dir)
     gen_legalizer.generate(isas, out_dir)
-    gen_registers.generate(isas, out_dir)
     gen_binemit.generate(isas, out_dir)
     gen_build_deps.generate()
 
diff --git a/lib/codegen/meta-python/gen_registers.py b/lib/codegen/meta-python/gen_registers.py
deleted file mode 100644
index 166bc611da..0000000000
--- a/lib/codegen/meta-python/gen_registers.py
+++ /dev/null
@@ -1,109 +0,0 @@
-"""
-Generate register bank descriptions for each ISA.
-"""
-
-from __future__ import absolute_import
-import srcgen
-
-try:
-    from typing import Sequence, List  # noqa
-    from cdsl.isa import TargetISA  # noqa
-    from cdsl.registers import RegBank, RegClass  # noqa
-except ImportError:
-    pass
-
-
-def gen_regbank(regbank, fmt):
-    # type: (RegBank, srcgen.Formatter) -> None
-    """
-    Emit a static data definition for regbank.
-    """
-    with fmt.indented('RegBank {', '},'):
-        fmt.format('name: "{}",', regbank.name)
-        fmt.format('first_unit: {},', regbank.first_unit)
-        fmt.format('units: {},', regbank.units)
-        fmt.format(
-                'names: &[{}],',
-                ', '.join('"{}"'.format(n) for n in regbank.names))
-        fmt.format('prefix: "{}",', regbank.prefix)
-        fmt.format('first_toprc: {},', regbank.toprcs[0].index)
-        fmt.format('num_toprcs: {},', len(regbank.toprcs))
-        fmt.format(
-                'pressure_tracking: {},',
-                'true' if regbank.pressure_tracking else 'false')
-
-
-def gen_regbank_units(regbank, fmt):
-    # type: (RegBank, srcgen.Formatter) -> None
-    """
-    Emit constants for all the register units in `regbank`.
-    """
-    for unit in range(regbank.units):
-        v = unit + regbank.first_unit
-        if unit < len(regbank.names):
-            fmt.format("{} = {},", regbank.names[unit], v)
-        else:
-            fmt.format("{}{} = {},", regbank.prefix, unit, v)
-
-
-def gen_regclass(rc, fmt):
-    # type: (RegClass, srcgen.Formatter) -> None
-    """
-    Emit a static data definition for a register class.
-    """
-    with fmt.indented(
-            'pub static {}_DATA: RegClassData = RegClassData {{'
-            .format(rc.name), '};'):
-        fmt.format('name: "{}",', rc.name)
-        fmt.format('index: {},', rc.index)
-        fmt.format('width: {},', rc.width)
-        fmt.format('bank: {},', rc.bank.index)
-        fmt.format('toprc: {},', rc.toprc.index)
-        fmt.format('first: {},', rc.bank.first_unit + rc.start())
-        fmt.format('subclasses: 0x{:x},', rc.subclass_mask())
-        mask = ', '.join('0x{:08x}'.format(x) for x in rc.mask())
-        fmt.format('mask: [{}],', mask)
-        fmt.line('info: &INFO,')
-    # Also emit a convenient reference for use by hand-written code.
-    fmt.line('#[allow(dead_code)]')
-    fmt.format('pub static {0}: RegClass = &{0}_DATA;', rc.name)
-
-
-def gen_isa(isa, fmt):
-    # type: (TargetISA, srcgen.Formatter) -> None
-    """
-    Generate register tables for isa.
-    """
-    if not isa.regbanks:
-        print('cargo:warning={} has no register banks'.format(isa.name))
-
-    with fmt.indented('pub static INFO: RegInfo = RegInfo {', '};'):
-        # Bank descriptors.
-        with fmt.indented('banks: &[', '],'):
-            for regbank in isa.regbanks:
-                gen_regbank(regbank, fmt)
-        with fmt.indented('classes: &[', '],'):
-            for rc in isa.regclasses:
-                fmt.format('&{}_DATA,', rc.name)
-
-    # Register class descriptors.
-    for rc in isa.regclasses:
-        gen_regclass(rc, fmt)
-
-    # Emit constants for all the register units.
-    fmt.line('#[allow(dead_code, non_camel_case_types)]')
-    fmt.line('#[derive(Clone, Copy)]')
-    with fmt.indented('pub enum RU {', '}'):
-        for regbank in isa.regbanks:
-            gen_regbank_units(regbank, fmt)
-    with fmt.indented('impl Into<RegUnit> for RU {', '}'):
-        with fmt.indented('fn into(self) -> RegUnit {', '}'):
-            fmt.line('self as RegUnit')
-
-
-def generate(isas, out_dir):
-    # type: (Sequence[TargetISA], str) -> None
-    for isa in isas:
-        fmt = srcgen.Formatter()
-        gen_isa(isa, fmt)
-        fmt.update_file('registers-{}.rs'.format(isa.name), out_dir)