Fix #357585, Padraig O'Briain.