Undo changes that break backward compatibility