Fix a regression from November on 3.5.5