Remove special backwards compatibility handling