Stop holding hadrian back with backwards compatibility