Ripping out vital code

Because I can't get github to believe it can be merged for some
unfathomable reason.