ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE!

Put it back with 690fb4c.