Some new cruft to replace it.