Hack around a regression I introduced yesterday