Fix regression from 7ad191d9f3301134126176a6726a65a69d67ca5e