Fix backward compatibility introduced by 5d5c0d2b