Began life as a copy of #1029557