Remove backwards compatibility; it didn't work anyway