This reverts commit e34801c8 and the followup due to multiple problems. I've tried to keep the tests and RDA parts where possible, as those still seem useful.
