Began life as a copy of #1029295